From 3e03ad766e0f27d4a483e7a52848a84302d83def Mon Sep 17 00:00:00 2001 From: Eddie Dong Date: Thu, 9 Jun 2011 16:24:09 +0800 Subject: [PATCH] Nested VMX: Add APIs to switch n1/n2 VMCS. Signed-off-by: Qing He Signed-off-by: Eddie Dong Signed-off-by: Tim Deegan Committed-by: Tim Deegan --- xen/arch/x86/hvm/vmx/vmcs.c | 31 ++++++++++++++++++++++++++++++ xen/include/asm-x86/hvm/vmx/vmcs.h | 2 ++ 2 files changed, 33 insertions(+) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 5bc70e8ddb..e4c47f22b6 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -670,6 +670,30 @@ void vmx_disable_intercept_for_msr(struct vcpu *v, u32 msr) } } +/* + * Switch VMCS between layer 1 & 2 guest + */ +void vmx_vmcs_switch(struct vmcs_struct *from, struct vmcs_struct *to) +{ + struct arch_vmx_struct *vmx = ¤t->arch.hvm_vmx; + spin_lock(&vmx->vmcs_lock); + + __vmpclear(virt_to_maddr(from)); + __vmptrld(virt_to_maddr(to)); + + vmx->vmcs = to; + vmx->launched = 0; + this_cpu(current_vmcs) = to; + + if ( vmx->hostenv_migrated ) + { + vmx->hostenv_migrated = 0; + vmx_set_host_env(current); + } + + spin_unlock(&vmx->vmcs_lock); +} + static int construct_vmcs(struct vcpu *v) { struct domain *d = v->domain; @@ -1079,6 +1103,13 @@ void vmx_do_resume(struct vcpu *v) hvm_migrate_timers(v); hvm_migrate_pirqs(v); vmx_set_host_env(v); + /* + * Both n1 VMCS and n2 VMCS need to update the host environment after + * VCPU migration. The environment of current VMCS is updated in place, + * but the action of another VMCS is deferred till it is switched in. + */ + v->arch.hvm_vmx.hostenv_migrated = 1; + hvm_asid_flush_vcpu(v); } diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 1c055ffb0d..299ee387bf 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -123,6 +123,7 @@ struct arch_vmx_struct { struct segment_register vm86_saved_seg[x86_seg_tr + 1]; /* Remember EFLAGS while in virtual 8086 mode */ uint32_t vm86_saved_eflags; + int hostenv_migrated; }; int vmx_create_vmcs(struct vcpu *v); @@ -392,6 +393,7 @@ int vmx_read_guest_msr(u32 msr, u64 *val); int vmx_write_guest_msr(u32 msr, u64 val); int vmx_add_guest_msr(u32 msr); int vmx_add_host_load_msr(u32 msr); +void vmx_vmcs_switch(struct vmcs_struct *from, struct vmcs_struct *to); #endif /* ASM_X86_HVM_VMX_VMCS_H__ */ -- 2.30.2